merge trunk
authorK. Handa <handa@gnu.org>
Tue, 19 Mar 2013 06:12:39 +0000 (15:12 +0900)
committerK. Handa <handa@gnu.org>
Tue, 19 Mar 2013 06:12:39 +0000 (15:12 +0900)
commitc72f055c8bb2db02e1b66cd70da9b88709356346
treeea15d5867b06f5e6d2cd587b8239f5fdc918563d
parent8047b892a8052813c285246a4b9980f7523ab039
parentb77bcb57b551b4fa3f491f49fff3bacad9dab88f
merge trunk